Skip to content

[folly/fizz/wangle/proxygen/fbthrift] Update to latest revision#13701

Merged
BillyONeal merged 20 commits intomicrosoft:masterfrom
PhoebeHui:dev/Phoebe/folly
Oct 28, 2020
Merged

[folly/fizz/wangle/proxygen/fbthrift] Update to latest revision#13701
BillyONeal merged 20 commits intomicrosoft:masterfrom
PhoebeHui:dev/Phoebe/folly

Conversation

@PhoebeHui
Copy link
Contributor

@PhoebeHui PhoebeHui commented Sep 24, 2020 •
edited
Loading

Related to #13536

  1. folly: remove 4 unused patches: find-double-conversion.patch fix-addbit.patch folly_c3861.patch fix-cmake-3.18.patch
  2. folly: update 2 patches that match the source change in new revision.
  3. folly: add fmt to 'Build-Depends'
  4. proxygen: remove patch fix-tools-path.patch and use vcpkg_copy_tools instead.
  5. fizz/wangle/proxygen/fbthrift need update togather.

All features test passed with x64-windows

@PhoebeHui PhoebeHui added info:internal category:port-update The issue is with a library, which is requesting update new revision labels Sep 24, 2020
@PhoebeHui PhoebeHui marked this pull request as ready for review September 27, 2020 05:52
@PhoebeHui PhoebeHui changed the title [folly] Update to latest revision [folly/fizz/wangle/proxygen] Update to latest revision Sep 27, 2020
@ras0219-msft
Copy link
Contributor

ras0219-msft commented Sep 28, 2020

/azp run

@azure-pipelines
Copy link

azure-pipelines bot commented Sep 28, 2020

Azure Pipelines successfully started running 1 pipeline(s).

JackBoosY
JackBoosY suggested changes Sep 28, 2020
View reviewed changes
@PhoebeHui PhoebeHui marked this pull request as draft September 28, 2020 06:15
@PhoebeHui PhoebeHui changed the title [folly/fizz/wangle/proxygen] Update to latest revision [folly/fizz/wangle/proxygen/fbthrift] Update to latest revision Oct 23, 2020
@PhoebeHui
Copy link
Contributor Author

PhoebeHui commented Oct 23, 2020 •
edited
Loading

proxygen:x64-osx failures looks same issue with gperf issue http://savannah.gnu.org/bugs/?53028, which fix by http://git.savannah.gnu.org/gitweb/?p=gperf.git;a=commitdiff;h=baf89d87f0d94b83e7764569da9d84dd36f82ba9.

Confirmed this issue solved by installing gperf 3.1 on macos.

Failures:

gperf_case_memcmp (register const char *s1, register const char *s2, register unsigned int n)
                   ^~~~~~~~~
generated/proxygen/lib/http/HTTPCommonHeaders.cpp:86:45: error: ISO C++17 does not allow 'register' storage class specifier [-Wregister]
gperf_case_memcmp (register const char *s1, register const char *s2, register unsigned int n)
                                            ^~~~~~~~~
generated/proxygen/lib/http/HTTPCommonHeaders.cpp:86:70: error: ISO C++17 does not allow 'register' storage class specifier [-Wregister]
gperf_case_memcmp (register const char *s1, register const char *s2, register unsigned int n)
                                                                     ^~~~~~~~~
generated/proxygen/lib/http/HTTPCommonHeaders.cpp:112:34: error: ISO C++17 does not allow 'register' storage class specifier [-Wregister]
HTTPCommonHeadersInternal::hash (register const char *str, register unsigned int len)
                                 ^~~~~~~~~
generated/proxygen/lib/http/HTTPCommonHeaders.cpp:112:60: error: ISO C++17 does not allow 'register' storage class specifier [-Wregister]
HTTPCommonHeadersInternal::hash (register const char *str, register unsigned int len)
                                                           ^~~~~~~~~
generated/proxygen/lib/http/HTTPCommonHeaders.cpp:143:3: error: ISO C++17 does not allow 'register' storage class specifier [-Wregister]
  register unsigned int hval = len;
  ^~~~~~~~~
generated/proxygen/lib/http/HTTPCommonHeaders.cpp:302:41: error: ISO C++17 does not allow 'register' storage class specifier [-Wregister]
HTTPCommonHeadersInternal::in_word_set (register const char *str, register unsigned int len)
                                        ^~~~~~~~~
generated/proxygen/lib/http/HTTPCommonHeaders.cpp:302:67: error: ISO C++17 does not allow 'register' storage class specifier [-Wregister]
HTTPCommonHeadersInternal::in_word_set (register const char *str, register unsigned int len)
                                                                  ^~~~~~~~~
generated/proxygen/lib/http/HTTPCommonHeaders.cpp:310:11: error: ISO C++17 does not allow 'register' storage class specifier [-Wregister]
          register int index = lookup[key];
          ^~~~~~~~~
generated/proxygen/lib/http/HTTPCommonHeaders.cpp:316:19: error: ISO C++17 does not allow 'register' storage class specifier [-Wregister]
                  register const char *s = wordlist[index].name;
                  ^~~~~~~~~
10 errors generated.

@PhoebeHui PhoebeHui added the category:infrastructure Pertaining to the CI/Testing infrastrucutre label Oct 23, 2020
@PhoebeHui PhoebeHui mentioned this pull request Oct 26, 2020
Closed
@PhoebeHui PhoebeHui added the depends:different-pr This PR or Issue depends on a PR which has been filed label Oct 27, 2020
@PhoebeHui PhoebeHui marked this pull request as ready for review October 27, 2020 01:22
@PhoebeHui PhoebeHui removed category:infrastructure Pertaining to the CI/Testing infrastrucutre depends:different-pr This PR or Issue depends on a PR which has been filed labels Oct 27, 2020
@PhoebeHui
Copy link
Contributor Author

PhoebeHui commented Oct 27, 2020

Disable proxygen:x64-osx temporarily for unblocking this PR, and will enable it when PR #14228 merged.

@JackBoosY JackBoosY added the info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. label Oct 28, 2020
@BillyONeal BillyONeal merged commit c34c418 into microsoft:master Oct 28, 2020
@BillyONeal
Copy link
Member

BillyONeal commented Oct 28, 2020

Thanks for your contribution!

Jimmy-Hu added a commit to Jimmy-Hu/vcpkg that referenced this pull request Oct 28, 2020
@Jimmy-Hu
Merge pull request #383 from microsoft/master
15dd0ef 
[folly/fizz/wangle/proxygen/fbthrift] Update to latest revision (microsoft#13701)
@PhoebeHui PhoebeHui deleted the dev/Phoebe/folly branch November 11, 2020 09:33
@PhoebeHui PhoebeHui mentioned this pull request Nov 12, 2020
Closed
dubois
dubois reviewed Sep 30, 2021
View reviewed changes
ports/folly/disable-non-underscore-posix-names.patch
+#include <direct.h>
+#include <io.h>
#pragma pop_macro("_CRT_INTERNAL_NONSTDC_NAMES")
-#pragma pop_macro("_CRT_DECLARE_NONSTDC_NAMES")
Copy link

@dubois dubois Sep 30, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @PhoebeHui , did you mean to add this line to the .patch? The resulting portability/Windows.h has a mismatched set of pragma push/pop macro lines.

Specifically, the resulting file contains #pragma push_macro("_CRT_DECLARE_NONSTDC_NAMES") but no #pragma pop_macro("_CRT_DECLARE_NONSTDC_NAMES")

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

2 more reviewers

@dubois dubois dubois left review comments

@JackBoosY JackBoosY JackBoosY approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@JackBoosY JackBoosY

Labels

category:port-update The issue is with a library, which is requesting update new revision info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@PhoebeHui @ras0219-msft @BillyONeal @dubois @JackBoosY